Some method renaming + file moves