Restructure classes & modules