Fixed cdbs dependence
Fixed
Moved some files