corrected import path issue and restructured app