Separated class declaration into independent files