Support for headless modules
More code reorganization