Feature/fix code architecture