revamped packages + created main class