Moved files and removed unnecessary extern crate everywhere