Refactoring layout of the sourcecode