Re-org'd dirs and added initial collector