corrected project structure. we'll see if it ports correctly