removed unneccesary semicolon
refactored package structure to somehting more meaningful