Temporary commit - restructuring to add web player