Refactored includes in main.js