Cleaned up directory
Cleaned up directory pt 2