Changed package structure
Fixed rendering bugs