Refactor project sructure