Removed contracts project and updated project references