Moved things and cleaned files, to start fresh.