Moving files and updating setup.
Readding files.