Refactors directry structure. Easier specific requirement