bugfix compiler plugin (max os)
refactoring structure
cleaning up code
refactoring