Freaking huge commit. Renaming, moving etc.