Moving files and getting ready to implement visitors