Changing the way requires are handled to make things more hygienic (still need to move some things to different directories).
Moving things to appropriate directories.