Fixed imports & hierarchies