updated workflow and file structure some