Perform major renaming and moving overhaul. Also fixes some minor parts left.