added new package structure to the code