Added dummy modules and renamed folders/files