Organized module locations. Fixed a context menu bug.