Renamed and re-organized
Fixes typo