General project structure change

reorganized the entire project structure