Moved dirs to the actual filesystem locations.

This eases the testing process and keeps the references intact.