Checked all dependencies, nearly ready with new directory structure