refactored project sctructure
new structure