Rearranged directories, splatted some bugs