Moved forms to seperate namespace