Directory tree reorganized (will be release 0.5)