Bunch of maintainability improvements and support for video importing