Revamped project layout
Removed unused components