Move scripts out of partial + fix build issue
Minor Changes