Moved field bases to seperate module