Cleaned up some code and the Directorys