Refactor project to support deployment in servelt container