Re-organisation and updated readme.
Combined into one build system.