moving to separate source directory
Placing in hierarhy for class names.