Change hierarchy, Rename files, Add RakeFile