changed project structure (2)

uncomplete commit: deleted duplicate classes