Changed package layout and add buildout conf