Added mac bin + better organization