Add interval system and organise files