Code refactoring + deleting useless src file