Revert "Moved the assignments to corresponding folders"

This reverts commit 25aef08785fafcde31140a4ebf69a6f83608b8c4.
Moved into corresponding folders one more try

This reverts commit cc137e7676b069b727838c67413e91caa80f8103.