Youtube improvements and refactoring

Moved spec files

Youtube improvements and refactoring