Restructuring app and adding some components
Added a generator