Renamed files, added prompting for initial setup