Code improvements and cleanup

CSS indented
Files put into folders