initial songify2 commit
tests and moved some files around