Added folders and spec