change package organization to follow Standard Directory Layout