Cleaned up main folder