Trying to maintain header folder structure for imports