Moved scripts into a more generic entry point