added full layout
refactor, added OS specific installs