Refactored, added package mgmt
Updated style