Added .osx files and moved things around a bit