refactored some module locations and names