Changed directory structure for easier submission.