Switch naming, start work on main executable