Updated project to work with later Mono releases. Some rearrangement