Separated packages and added references