Folder structure change. Added Master and Slave packages