Cleaning up directory structure and CSS