Refactor of Analysis project

Lobotomized common objects