Fixed all references from efforia site
Started fixing separated modules and added nice package names