Updated paths to main classes