Separated the class to another project