Re-structure and dependency fix