Moving files to a more proper scheme
renaming methods