Removed old functions file again. Addition of dynamic components in correct files