Reorganizing source files for better in order to simplify folder structure.
Reorganizing source files for better in order to simplify folder structure.