Separating into folders to include package.jsons