Update readme
Split into modules
Fix module references
Fix module references
Fix static references