Refactored files for .jar deployment