Revert "Restructuring code. Directory structure has changed."

This reverts commit 9cfa857118aa6bbfa61594c61100b63a2d60b0b9.