refactoring: restructered project and js concat