Moved struct to own file