Change folder structure to integration easier