chanaged folder structure (AGAIN!)
Merge branch 'master' of https://github.com/ip-k/IM.git