Reorganised and created simple script entry points