Cleaned up main directory