Removed unnecessary common file
More file refactoring