crud refactoring (resource linking disabled)
some major refactoring