Moved script items to appropriate locations