restructuring

Types are now moved to their own folder