Move structures to module.
Clean up code.
Changed files to new module structure system.