Just reworking file structure