Refactored the directory structure.