Refactored some of the directory structuring