Updating the basic files and moving things around