updated main for new file structure