Modified main class because of path changes