some clean up and reorg
some clean up and reorg

eohomegrownapps/musicblocks,Hrishi1999/musicblocks,eohomegrownapps/musicblocks,Hrishi1999/musicblocks,walterbender/musicblocks,walterbender/musicblocks,walterbender/musicblocks,eohomegrownapps/musicblocks,sachi-d/musicblocks,sachi-d/musicblocks,Hrishi1999/musicblocks,sachi-d/musicblocks