add better file structuring