Further cleaning the directory in preparation for refactoring the codebase.