Associations management fixed; Modules restructured