organized imports
moved configuration to core