Moved stuff into arch folder. Added osx folder