Changed file names and added some basic formatting