Architecture changes

Updated module locations to align with architecture changes