Moved files to bridge directory

Fixed Misc bugs