Moving everything into a package. Starting to create wrapper objects