Moved some files; implemented into new box format