Some file rearranging and removal of sidebar.