Feature/re scaffold

Re-scaffolded the project for easier installation.