Reorganized project structure and updated build files with new approach