Further editing

Continuing to build basic structure of the project