updated packages and changed structure to utilize lib directory