Changes in source files structure to make it a bit manageable to prepare distribution version