Restructuring a bit..