Version 0.3.1

- code organized