xcode
move stuff around for Xcode
update setup