modified the entire project structure