[2014.12.24 #5] Source Refactoring