Added missing files, refactoring