Added missing identation
Reorganized source files