Removed unnecessary methods
Restructured package