Moved some folders around to places that made more sense