Refactored BTV package to Main