Created a more coherent file structure