Refactored package name, added lib folder