directory restructuring and minor readme changes