-Changed name of packages to a more layer oriented structure