reorganize project structure and remain stuff