Moving, renaming & fixes