Updated to 6.0.3. Rearranged directory and added batching