Moved files, added setup