Flocking added. Cleaned up directories