Restructured the directory to be cleaner.