Moved some files around, gave the wrapper classes and wrapper collection super classes