Code review
Restructured source files