added imports into core to simplify structure
removed some temp files