Moved content to appropriate places