moving class to its own file