[WIP] moving classes to it's own files and filtering options parameters