Added extra utility files
Reorganized