Improved layout of files and added deploy script
First mac branch