[DEV] Cleaned up directories