Cleaned up folder system.