lots of styling change and file structure