Still trying to fix constructions folder hierarchy...