Changed package structure. Added new classes