[Closes #16] Renamed several directories