Rearranged files. Added bull. Started imp.