Update, with better filenames and cleaner main file