Removed time translation test
Some refactoring and file split