reverted to IDEA project structure
merged with old project structure