changed project layout as it had wierd imports in all classes
Merge pull request #1 from setu9760/v2.1

changed project layout as it had wierd imports in all classes