Refactored HQ - removing bootswatch dep
Project structure refactoring - final touches