Feature/project layout

Adds changes from feature/html_and_constants