reworking folder and file layout