Clean up directory structure, unused files, etc