Cleaned up paths and methods in preparation of actually streaming content