Added basic component modules
Edited MJ error/common modules