Minor Bug Fixes and Project Structure Updates