Reorganized files and added Crate files