Added Final Submission files

Please use these files for the final submission development. They are
all uniform, and work without conflicts.