Reorganizing .osx (unfinished)