Changed file names, moved some things around cleaned up.