Rearranged my workspace, still a work in progress