re-structured webscript hierarchy to improve readability