Reorganizing project structure and fixing build setup.