Rearrange directories
Update to version 0.2-alpha