fixed structure, add most files