Fixed addressing
Restructuring top level entity