Changes after reviewing. Moved to packages