New modules to separate "base" types from Resource AST
Remove Resource AST type