Rename file for normalisation of scripts
Further normalising and new funcs