cleaned up main folder