Refactoring of project structure, and updates to implement twitter-Bootstrap 3