Cleaned up folder tree