Updated code

Adding more classes and custom package, isn't fully working yet having
issues with custom package