Restructure File Layout

Restructure the file layout and change the css to fit content
appropriately