Directory structure changed due to cmake support(soon!)