rename files and folders, moved some methods around, fixed some spacing