Project restructure, refactor, mechdb updates

See commits for detailed info