Some changes with the build and main class/files