Some files reworked