Moved about some packages and added a gui api module type