Reorganized file and package structure.
Setting version to 0.3.50
Setting version to 0.3.51-SNAPSHOT