more solutions. all files moved to src folder