Re-organized repository to properly isolate module