Worked on styles, and did some clean-up of project structure