Moved all scripts to be encapsulated