Layout issues mostly fixed, files renamed to remove prototype suffix
Post-merge