scms - major refactoring in parsing files