5th thing init + better dir structure