Directory cleanup and some styling