refactor dirs and include proper fw mkfile