Minor changes applied

Reorganized some source files