Improved script/ci organisation