Moved libraries where they belong. Included stuff required for tests.