re-organized the file structures