Fixed repo layout

Enforcing best practices