Put the directory back
Fix a capitalization bug, fix setup