Package clean up
All code for finding info about video moved to a module