Started add functionaility
Cleaned up directories