Made major structural changes and added (empty) files to represent the future modules planned