moved files into subfolder, cleaned up / changed album parsing a little, added a quick testcase