Fix fodler structure