Stilgiyin java codebase refactored