Moved classes into new package, solved circular dependency