moved classes into separate dirs
added w2d1 dir