Added optimized folder, starting to port from extracted to optimization.