Continued refactoring
Continued refactoring
Continued refactoring
Split source into two parts
Continued refactoring
Splitted source into two parts
Continued refactoring
Splitted source into two parts
Continued reafctoring
Continued refactoring
Splitted source in two parts