Inlcude black gate and move forms to forms folder