WIP - Moving scripts into folder