Modularization and correction across multiple files

Signed-off-by: Mustafa Ozcelikors <mozcelikors@gmail.com>
12 files changed