refactoring: files moved to logical folders

@taviscaron, check please