structering the code
fixing package configuration