revamped project skeleton

revamped project skeleton based on user flow