Cleaned up file tree