Update file organization and add some more basic styling