Fix up files names
More cleanup
beautify code