Final clean up ?

Still have to write the read me files.