I've been using Mylio on my laptop which might suit you? My main requirement was that I organise photos using my file structure for maximum portability, and this works well with that.