sort out folders and adding test project