Re-arranged file structure and .css main file