Reorganize and restructure files