Updating folder structure to latest buildmanager standars