Changed module syntax. Cleanup. README updated