v 0.2a

Rename some module
Architecture changes