Folder Reorganization

and tiny css tweaks