Refactoring files into a more logical directory/naming structure