Removed uneeded script
template re-organization