Added more modules and removed others

On 28/01/12, @amshel and I had a meeting on his place to discuss the
achitecture and this is what we came up.