Move files into Internal folder, clean up some usings