changed project layout as it had wierd imports in all classes