Seperated two groovy files to ensure the order works