Major improvements to structure. Added support for non-mac computers