Removed the structure factory - not needed as of now