Reorganized classes
Rename src to source