Transformed to lib, slowly removing "app" parts