Major cleaning. Added baseline build.