Import 3
 * Reorganized all files in order to get things less man-handled.