Changed structure and names
Bumped version to 0.4 and updated README
Merge branch 'release/v0.4'