Cleaned up the file tree