reworking file structure