Adding likelihood and optimization modules
Preparing for mayor refactoring!