Sub-function Updates

Made folders and updated some sub-functions