Re-organizing the files. Not sure this is the directory structure I want in the end.