Moving package to be on the top-level, instead of one level down
Updated structure as well as added package and source