Directory structure change
Will apply cmake soon